Merge remote-tracking branch 'origin/master' into PeekAtRemainingCandidates
authorEh2406 <YeomanYaacov@gmail.com>
Sun, 25 Feb 2018 01:23:49 +0000 (20:23 -0500)
committerEh2406 <YeomanYaacov@gmail.com>
Sun, 25 Feb 2018 01:28:54 +0000 (20:28 -0500)
commit0be926defd72d6c350470f0f40ee720daa7e1cac
tree388b119392364b0540840d4afe24b94d03406da4
parentee8eadec38f48b595838bc27441dfd7d9074389c
parentfe0c18b9dbd491845e5e3e50390dcfbe0cf00215
Merge remote-tracking branch 'origin/master' into PeekAtRemainingCandidates

# Conflicts:
# src/cargo/core/resolver/mod.rs
src/cargo/core/resolver/mod.rs